Skip to content

Bump version to v3.0.0#6425

Merged
steviez merged 2 commits into
anza-xyz:masterfrom
steviez:bump_to_v3
Jun 6, 2025
Merged

Bump version to v3.0.0#6425
steviez merged 2 commits into
anza-xyz:masterfrom
steviez:bump_to_v3

Conversation

@steviez
Copy link
Copy Markdown

@steviez steviez commented Jun 5, 2025

Problem

Update the version in master to v3.0.0 given that the v2.3 branch now exists

@steviez steviez requested a review from a team as a code owner June 5, 2025 04:09
buffalojoec
buffalojoec previously approved these changes Jun 5, 2025
View reviewed changes
Copy link
Copy Markdown

@buffalojoec buffalojoec left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Comment thread svm/tests/example-programs/hello-solana/Cargo.toml Outdated
Copy link
Copy Markdown

@buffalojoec buffalojoec Jun 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is fine, for consistency, but these crates aren't published and we are probably going to refactor a lot of the svm examples and tests stuff soon. Just flagging.

Copy link
Copy Markdown
Author

@steviez steviez Jun 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Understood. Right now, the scrip just picks up all Cargo.toml files. I think it is fine to march these along, but it would be nice to get this ripped out before we publish v3.0 crates (which won't be for a couple months probably)

@codecov-commenter
Copy link
Copy Markdown

codecov-commenter commented Jun 5, 2025 •
edited
Loading

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 82.8%. Comparing base (7b3de47) to head (26c673c).
⚠️ Report is 3222 commits behind head on master.

Additional details and impacted files 
@@            Coverage Diff            @@
##           master    #6425     +/-   ##
=========================================
- Coverage    82.8%    82.8%   -0.1%     
=========================================
  Files         847      847             
  Lines      379486   379497     +11     
=========================================
- Hits       314511   314332    -179     
- Misses      64975    65165    +190
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@steviez
Copy link
Copy Markdown
Author

steviez commented Jun 5, 2025

Some of the downstream SPL checks failed, looks like it is having trouble picking a version since SPL depends on some crates from this monorepo:

error: failed to select a version for `solana-clock`.
    ... required by package `solana-cli-output v2.2.1`
    ... which satisfies dependency `solana-cli-output = "^2.2.0"` of package `spl-token-client v0.16.1`
    ... which satisfies dependency `spl-token-client = "^0.16.1"` of package `spl-single-pool-cli v2.0.0 (/home/runner/work/agave/agave/target/downstream-projects/single-pool/clients/cli)`
versions that meet the requirements `=2.2.1` are: 2.2.1

all possible versions conflict with previously selected packages.

  previously selected package `solana-clock v2.2.2`
    ... which satisfies dependency `solana-clock = "^2.2.1"` of package `solana-account v2.2.1`
    ... which satisfies dependency `solana-account = "^2.2.1"` of package `solana-sdk v2.2.1`
    ... which satisfies dependency `solana-sdk = "^2.2.1"` of package `spl-single-pool-cli v2.0.0 (/home/runner/work/agave/agave/target/downstream-projects/single-pool/clients/cli)`

failed to select a version for `solana-clock` which could resolve this conflict

Namely, this being locked looks to be problematic:

versions that meet the requirements `=2.2.1` are: 2.2.1

@steviez steviez mentioned this pull request Jun 5, 2025
Merged
steviez
steviez commented Jun 6, 2025
View reviewed changes
Comment thread feature-set/Cargo.toml Outdated
Comment thread programs/sbf/Cargo.toml Outdated
Copy link
Copy Markdown
Author

@steviez steviez Jun 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Making a note - this didn't get picked up when I ran:

./scripts/increment-cargo-version.sh major

@steviez steviez mentioned this pull request Jun 6, 2025
Merged
@steviez
Copy link
Copy Markdown
Author

steviez commented Jun 6, 2025

Force pushes were to pick up #6439, and then to resolve merge conflict from #6408

@steviez steviez requested review from brooksprumo, t-nelson and yihau June 6, 2025 16:57
brooksprumo
brooksprumo reviewed Jun 6, 2025
View reviewed changes
Comment thread Cargo.lock
Comment thread Cargo.lock
Comment thread Cargo.lock
brooksprumo
brooksprumo approved these changes Jun 6, 2025
View reviewed changes
Copy link
Copy Markdown

@brooksprumo brooksprumo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approving because it unblocks a lot of other work. We have lots of time to fix/investigate any dependency versions before there's a release.

@steviez steviez merged commit de02c09 into anza-xyz:master Jun 6, 2025
38 checks passed
@steviez steviez deleted the bump_to_v3 branch June 6, 2025 19:15
mircea-c added a commit to mircea-c/agave that referenced this pull request Jun 12, 2025
@mircea-c
Bump version to v3.0.0 (anza-xyz#6425)
0e04a0a
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@brooksprumo brooksprumo brooksprumo approved these changes

@LucasSte LucasSte LucasSte approved these changes

@buffalojoec buffalojoec buffalojoec left review comments

@t-nelson t-nelson Awaiting requested review from t-nelson

@yihau yihau Awaiting requested review from yihau

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@steviez @codecov-commenter @brooksprumo @LucasSte @buffalojoec